Don't make faces depend on window-system.

diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 49bd228e280b421310e79419bed3ace49ebea8aa..86147a2ca731f7363e5e64e37f1a921143380ad8 100644 (file)
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -544,51 +544,49 @@ when syntaxifying a chunk of buffer."
                                   (repeat symbol)))))
   :group 'cperl-faces)
 
-(if window-system
-    (progn
-      (defvar cperl-dark-background
-       (cperl-choose-color "navy" "os2blue" "darkgreen"))
-      (defvar cperl-dark-foreground
-       (cperl-choose-color "orchid1" "orange"))
-
-      (defface cperl-nonoverridable-face
-       `((((class grayscale) (background light))
-          (:background "Gray90" :slant italic :underline t))
-         (((class grayscale) (background dark))
-          (:foreground "Gray80" :slant italic :underline t :weight bold))
-         (((class color) (background light))
-          (:foreground "chartreuse3"))
-         (((class color) (background dark))
-          (:foreground ,cperl-dark-foreground))
-         (t (:weight bold :underline t)))
-       "Font Lock mode face used to highlight array names."
-       :group 'cperl-faces)
-
-      (defface cperl-array-face
-       `((((class grayscale) (background light))
-          (:background "Gray90" :weight bold))
-         (((class grayscale) (background dark))
-          (:foreground "Gray80" :weight bold))
-         (((class color) (background light))
-          (:foreground "Blue" :background "lightyellow2" :weight bold))
-         (((class color) (background dark))
-          (:foreground "yellow" :background ,cperl-dark-background :weight bold))
-         (t (:weight bold)))
-       "Font Lock mode face used to highlight array names."
-       :group 'cperl-faces)
-
-      (defface cperl-hash-face
-       `((((class grayscale) (background light))
-          (:background "Gray90" :weight bold :slant italic))
-         (((class grayscale) (background dark))
-          (:foreground "Gray80" :weight bold :slant italic))
-         (((class color) (background light))
-          (:foreground "Red" :background "lightyellow2" :weight bold :slant italic))
-         (((class color) (background dark))
-          (:foreground "Red" :background ,cperl-dark-background :weight bold :slant italic))
-         (t (:weight bold :slant italic)))
-       "Font Lock mode face used to highlight hash names."
-       :group 'cperl-faces)))
+(defvar cperl-dark-background
+  (cperl-choose-color "navy" "os2blue" "darkgreen"))
+(defvar cperl-dark-foreground
+  (cperl-choose-color "orchid1" "orange"))
+
+(defface cperl-nonoverridable-face
+  `((((class grayscale) (background light))
+     (:background "Gray90" :slant italic :underline t))
+    (((class grayscale) (background dark))
+     (:foreground "Gray80" :slant italic :underline t :weight bold))
+    (((class color) (background light))
+     (:foreground "chartreuse3"))
+    (((class color) (background dark))
+     (:foreground ,cperl-dark-foreground))
+    (t (:weight bold :underline t)))
+  "Font Lock mode face used to highlight array names."
+  :group 'cperl-faces)
+
+(defface cperl-array-face
+  `((((class grayscale) (background light))
+     (:background "Gray90" :weight bold))
+    (((class grayscale) (background dark))
+     (:foreground "Gray80" :weight bold))
+    (((class color) (background light))
+     (:foreground "Blue" :background "lightyellow2" :weight bold))
+    (((class color) (background dark))
+     (:foreground "yellow" :background ,cperl-dark-background :weight bold))
+    (t (:weight bold)))
+  "Font Lock mode face used to highlight array names."
+  :group 'cperl-faces)
+
+(defface cperl-hash-face
+  `((((class grayscale) (background light))
+     (:background "Gray90" :weight bold :slant italic))
+    (((class grayscale) (background dark))
+     (:foreground "Gray80" :weight bold :slant italic))
+    (((class color) (background light))
+     (:foreground "Red" :background "lightyellow2" :weight bold :slant italic))
+    (((class color) (background dark))
+     (:foreground "Red" :background ,cperl-dark-background :weight bold :slant italic))
+    (t (:weight bold :slant italic)))
+  "Font Lock mode face used to highlight hash names."
+  :group 'cperl-faces)
 
 \f